Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
K
karname-ui
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Reza Sahebgharan
karname-ui
Commits
437d73b1
Commit
437d73b1
authored
Nov 25, 2019
by
Reza Sahebgharan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(background color for mobile): set background color for mobile build
parent
1a2ad098
Pipeline
#632
passed with stages
in 46 minutes and 38 seconds
Changes
7
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
109 additions
and
28 deletions
+109
-28
README.md
README.md
+2
-2
routes.js
client/plugins/routes.js
+75
-14
ChangePassword.vue
client/views/ChangePassword.vue
+6
-4
Login.vue
client/views/Login.vue
+16
-3
Register.vue
client/views/Register.vue
+5
-2
mobile-config.js
mobile-config.js
+3
-2
settings.json
settings.json
+2
-1
No files found.
README.md
View file @
437d73b1
...
...
@@ -76,4 +76,4 @@ networks:
docker-compose up -d --force-recreate
-
goto localhost
\ No newline at end of file
-
goto localhost
\ No newline at end of file
client/plugins/routes.js
View file @
437d73b1
...
...
@@ -33,12 +33,79 @@
// import EditWorkList from '../components/EditWorkList.vue';
// import WorkList from '../components/Worklist.vue';
// import AppVersion from '../views/AppVersion.vue';
// const routes = [{
// path: '/',
// component: () =>
// import ('../views/Home.vue'),
// name: 'Home'
// },
// {
// path: '/appversion',
// component: AppVersion,
// name: 'AppVersion'
// },
// {
// path: '/signin',
// component: () =>
// import ('../views/Login.vue'),
// name: 'signin'
// },
// {
// path: '/signup',
// component: () =>
// import ('../views/Register.vue'),
// name: 'signup'
// },
// {
// path: '/changePassword',
// component: () =>
// import ('../views/ChangePassword.vue'),
// name: 'changePassword'
// }, {
// path: '/main',
// component: () =>
// import ('../views/Main.vue'),
// name: 'main',
// children: [{
// path: "worklist",
// name: "worklist",
// components: {
// default: () =>
// import ('../components/Worklist.vue'),
// edit_worklist: () =>
// import ('../components/EditWorkList.vue')
// }
// }]
// }
// ];
// export default routes;
import
Login
from
'../views/Login.vue'
;
import
Home
from
'../views/Home.vue'
;
import
Register
from
'../views/Register.vue'
;
import
ChangePassword
from
'../views/ChangePassword.vue'
;
import
Main
from
'../views/Main.vue'
;
import
EditWorkList
from
'../components/EditWorkList.vue'
;
import
WorkList
from
'../components/Worklist.vue'
;
import
AppVersion
from
'../views/AppVersion.vue'
;
const
routes
=
[{
path
:
'/'
,
component
:
()
=>
import
(
'../views/Home.vue'
),
component
:
Home
,
name
:
'Home'
},
{
...
...
@@ -48,34 +115,28 @@ const routes = [{
},
{
path
:
'/signin'
,
component
:
()
=>
import
(
'../views/Login.vue'
),
component
:
Login
,
name
:
'signin'
},
{
path
:
'/signup'
,
component
:
()
=>
import
(
'../views/Register.vue'
),
component
:
Register
,
name
:
'signup'
},
{
path
:
'/changePassword'
,
component
:
()
=>
import
(
'../views/ChangePassword.vue'
),
component
:
ChangePassword
,
name
:
'changePassword'
},
{
path
:
'/main'
,
component
:
()
=>
import
(
'../views/Main.vue'
),
component
:
Main
,
name
:
'main'
,
children
:
[{
path
:
"worklist"
,
name
:
"worklist"
,
components
:
{
default
:
()
=>
import
(
'../components/Worklist.vue'
),
edit_worklist
:
()
=>
import
(
'../components/EditWorkList.vue'
)
default
:
WorkList
,
edit_worklist
:
EditWorkList
}
}]
}
...
...
client/views/ChangePassword.vue
View file @
437d73b1
...
...
@@ -2,8 +2,12 @@
<v-app
id=
"inspire"
>
<auth-header
btnToProp=
"signin"
btnLabel=
"Register.loginBtn"
btnIconName=
"mdi-login"
></auth-header>
<v-content>
<v-container
fluid
class=
"align-center fill-height backgroundImg"
>
<v-row
justify=
"center"
class=
"loginCard"
>
<v-container
style=
"background-color:rgb(94, 181, 177,.85)"
fluid
class=
"align-center fill-height backgroundImg"
>
<v-row
justify=
"center"
class=
"loginCard"
>
<v-col
xs=
"8"
sm=
"6"
md=
"4"
lg=
"3"
>
<v-card
class=
"elevation-12 roundedCard"
light
elevation=
"24"
>
<v-toolbar
color=
"rgb(94, 181, 177,.85)"
dark
>
...
...
@@ -61,7 +65,6 @@
</v-row>
</v-container>
</v-form>
</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
...
...
@@ -237,7 +240,6 @@ img {
z-index
:
1
;
}
.backgroundImg
{
overflow-y
:
hidden
;
}
...
...
client/views/Login.vue
View file @
437d73b1
...
...
@@ -3,7 +3,12 @@
<v-app
id=
"inspire"
>
<auth-header
btnToProp=
"signup"
btnLabel=
"Login.registerBtn"
btnIconName=
"mdi-account-plus"
></auth-header>
<v-content>
<v-container
fluid
fill-height
class=
"align-center backgroundImg"
>
<v-container
style=
"background-color:rgb(94, 181, 177,.85)"
fluid
fill-height
class=
"align-center backgroundImg"
>
<v-row
justify=
"center"
class=
"loginCard"
>
<v-col
xs=
"8"
sm=
"6"
md=
"4"
lg=
"3"
>
<v-card
class=
"elevation-12 roundedCard"
light
elevation=
"24"
>
...
...
@@ -187,13 +192,21 @@ export default {
<
style
scoped
>
.backgroundImg
{
background-color
:
#abdae4
ad
;
background-image
:
linear-gradient
(
background-image
:
-moz-linear-gradient
(
141deg
,
#9fb8ad
0%
,
#1fc8db
51%
,
#2ce8ce
b0
75%
);
background-image
:
-webkit-linear-gradient
(
141deg
,
#9fb8ad
0%
,
#1fc8db
51%
,
#2ce8ce
b0
75%
);
}
div
.backgroundImg
{
background-color
:
#abdae4
ad
!important
;
}
img
{
...
...
client/views/Register.vue
View file @
437d73b1
...
...
@@ -2,7 +2,11 @@
<v-app
id=
"inspire"
>
<auth-header
btnToProp=
"signin"
btnLabel=
"Register.loginBtn"
btnIconName=
"mdi-login"
></auth-header>
<v-content>
<v-container
fluid
class=
"align-center fill-height backgroundImg"
>
<v-container
style=
"background-color:rgb(94, 181, 177,.85)"
fluid
class=
"align-center fill-height backgroundImg"
>
<v-row
justify=
"center"
class=
"loginCard"
>
<v-col
xs=
"8"
sm=
"6"
md=
"4"
lg=
"3"
>
<v-card
class=
"elevation-12 roundedCard"
light
elevation=
"24"
>
...
...
@@ -223,7 +227,6 @@ img {
z-index
:
1
;
}
.backgroundImg
{
overflow-y
:
hidden
;
}
...
...
mobile-config.js
View file @
437d73b1
...
...
@@ -2,7 +2,7 @@ App.info({
id
:
'marcopacs.karname.ir'
,
name
:
'karname-app'
,
version
:
"0.0.1"
})
})
;
App
.
setPreference
(
'android-targetSdkVersion'
,
'19'
)
App
.
setPreference
(
'android-targetSdkVersion'
,
'19'
)
;
App
.
accessRule
(
'*'
);
\ No newline at end of file
settings.json
View file @
437d73b1
{
"worklistUrl"
:
"http://
192.168.0.49:8086"
"worklistUrl"
:
"http://
staging.karname.ir:8086"
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment