diff --git a/public/img/anime3.png b/public/img/anime3.png new file mode 100755 index 0000000..130d043 Binary files /dev/null and b/public/img/anime3.png differ diff --git a/public/img/anime6.png b/public/img/anime6.png new file mode 100755 index 0000000..cc29817 Binary files /dev/null and b/public/img/anime6.png differ diff --git a/src/assets/img/apple-icon.png b/public/img/apple-icon.png similarity index 100% rename from src/assets/img/apple-icon.png rename to public/img/apple-icon.png diff --git a/public/img/bg5.jpg b/public/img/bg5.jpg new file mode 100755 index 0000000..423e888 Binary files /dev/null and b/public/img/bg5.jpg differ diff --git a/public/img/default-avatar.png b/public/img/default-avatar.png new file mode 100755 index 0000000..ca9fa88 Binary files /dev/null and b/public/img/default-avatar.png differ diff --git a/public/img/emilyz.jpg b/public/img/emilyz.jpg new file mode 100755 index 0000000..8a6fad2 Binary files /dev/null and b/public/img/emilyz.jpg differ diff --git a/src/assets/img/favicon.png b/public/img/favicon.png similarity index 100% rename from src/assets/img/favicon.png rename to public/img/favicon.png diff --git a/public/img/header.jpg b/public/img/header.jpg new file mode 100755 index 0000000..f98e238 Binary files /dev/null and b/public/img/header.jpg differ diff --git a/public/img/img_3115.jpg b/public/img/img_3115.jpg new file mode 100755 index 0000000..b32a9f4 Binary files /dev/null and b/public/img/img_3115.jpg differ diff --git a/public/img/james.jpg b/public/img/james.jpg new file mode 100755 index 0000000..3cb4322 Binary files /dev/null and b/public/img/james.jpg differ diff --git a/public/img/mike.jpg b/public/img/mike.jpg new file mode 100755 index 0000000..cac7d3a Binary files /dev/null and b/public/img/mike.jpg differ diff --git a/src/assets/img/background.jpg b/src/assets/img/background.jpg deleted file mode 100755 index 0fc5797..0000000 Binary files a/src/assets/img/background.jpg and /dev/null differ diff --git a/src/assets/img/faces/face-0.jpg b/src/assets/img/faces/face-0.jpg deleted file mode 100755 index 5a9348e..0000000 Binary files a/src/assets/img/faces/face-0.jpg and /dev/null differ diff --git a/src/assets/img/faces/face-1.jpg b/src/assets/img/faces/face-1.jpg deleted file mode 100755 index bc74fea..0000000 Binary files a/src/assets/img/faces/face-1.jpg and /dev/null differ diff --git a/src/assets/img/faces/face-2.jpg b/src/assets/img/faces/face-2.jpg deleted file mode 100755 index 7e7055c..0000000 Binary files a/src/assets/img/faces/face-2.jpg and /dev/null differ diff --git a/src/assets/img/faces/face-3.jpg b/src/assets/img/faces/face-3.jpg deleted file mode 100755 index 3e470d6..0000000 Binary files a/src/assets/img/faces/face-3.jpg and /dev/null differ diff --git a/src/assets/img/glyphicons-halflings-regular.8988968.svg b/src/assets/img/glyphicons-halflings-regular.8988968.svg deleted file mode 100755 index 94fb549..0000000 --- a/src/assets/img/glyphicons-halflings-regular.8988968.svg +++ /dev/null @@ -1,288 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/img/new_logo.png b/src/assets/img/new_logo.png deleted file mode 100755 index 8e2192b..0000000 Binary files a/src/assets/img/new_logo.png and /dev/null differ diff --git a/src/assets/img/tim_80x80.png b/src/assets/img/tim_80x80.png deleted file mode 100755 index 1f7aa0d..0000000 Binary files a/src/assets/img/tim_80x80.png and /dev/null differ diff --git a/src/assets/img/vue-logo.png b/src/assets/img/vue-logo.png deleted file mode 100755 index 74389d8..0000000 Binary files a/src/assets/img/vue-logo.png and /dev/null differ diff --git a/src/components/BaseButton.vue b/src/components/BaseButton.vue index 6e6f800..31916e3 100644 --- a/src/components/BaseButton.vue +++ b/src/components/BaseButton.vue @@ -8,7 +8,7 @@ :class="[ {'btn-round': round}, {'btn-block': block}, - {'btn-just-icon': icon}, + {'btn-icon': icon}, {[`btn-${type}`]: type && !outline}, {[`btn-outline-${type}`]: type && outline}, {[`btn-${size}`]: size}, diff --git a/src/components/Cards/Card.vue b/src/components/Cards/Card.vue index e9ec55f..8b9f67d 100644 --- a/src/components/Cards/Card.vue +++ b/src/components/Cards/Card.vue @@ -1,5 +1,5 @@ - + @@ -14,7 +14,6 @@ @@ -24,7 +23,8 @@ export default { name: "card", props: { title: String, - subTitle: String + subTitle: String, + type: String } }; diff --git a/src/components/Inputs/formGroupInput.vue b/src/components/Inputs/formGroupInput.vue index 61d347b..868731f 100644 --- a/src/components/Inputs/formGroupInput.vue +++ b/src/components/Inputs/formGroupInput.vue @@ -10,13 +10,14 @@ - - + + + diff --git a/src/layout/dashboard/DashboardLayout.vue b/src/layout/dashboard/DashboardLayout.vue index d44713f..b150735 100644 --- a/src/layout/dashboard/DashboardLayout.vue +++ b/src/layout/dashboard/DashboardLayout.vue @@ -6,7 +6,7 @@ - + diff --git a/src/pages/Profile.vue b/src/pages/Profile.vue new file mode 100644 index 0000000..ab89762 --- /dev/null +++ b/src/pages/Profile.vue @@ -0,0 +1,43 @@ + + + + + + + + + + + + + diff --git a/src/pages/Profile/EditProfileForm.vue b/src/pages/Profile/EditProfileForm.vue new file mode 100644 index 0000000..d3585f3 --- /dev/null +++ b/src/pages/Profile/EditProfileForm.vue @@ -0,0 +1,95 @@ + + + Edit Profile + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + About Me + + + + + + + Save + + + + diff --git a/src/pages/Profile/UserCard.vue b/src/pages/Profile/UserCard.vue new file mode 100644 index 0000000..4e1a858 --- /dev/null +++ b/src/pages/Profile/UserCard.vue @@ -0,0 +1,48 @@ + + + + + + + + + + + + {{user.fullName}} + + + {{user.title}} + + + + + {{user.description}} + + + + + + + + + + + + + + + + diff --git a/src/pages/UserProfile.vue b/src/pages/UserProfile.vue deleted file mode 100644 index c8a8a46..0000000 --- a/src/pages/UserProfile.vue +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/src/pages/UserProfile/EditProfileForm.vue b/src/pages/UserProfile/EditProfileForm.vue deleted file mode 100644 index 8835ddd..0000000 --- a/src/pages/UserProfile/EditProfileForm.vue +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - About Me - - - - - - - - - Update Profile - - - - - - - - - diff --git a/src/pages/UserProfile/MembersCard.vue b/src/pages/UserProfile/MembersCard.vue deleted file mode 100644 index e810f0b..0000000 --- a/src/pages/UserProfile/MembersCard.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - {{member.name}} - - - {{member.status}} - - - - - - - - - - - - - - - - diff --git a/src/pages/UserProfile/UserCard.vue b/src/pages/UserProfile/UserCard.vue deleted file mode 100644 index a43e2ee..0000000 --- a/src/pages/UserProfile/UserCard.vue +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - Chet Faker - - - @chetfaker - - - - - "I like the way you work it - No diggity - I wanna bag it up" - - - - - - - {{info.title}} - - {{info.subTitle}} - - - - - - - - diff --git a/src/plugins/globalComponents.js b/src/plugins/globalComponents.js index 4e672e8..fc15200 100644 --- a/src/plugins/globalComponents.js +++ b/src/plugins/globalComponents.js @@ -5,7 +5,7 @@ import { FormGroupInput, Card, BaseDropdown, BaseButton } from "../components/in const GlobalComponents = { install(Vue) { - Vue.component("fg-input", FormGroupInput); + Vue.component(FormGroupInput.name, FormGroupInput); Vue.component(Card.name, Card); Vue.component(BaseDropdown.name, BaseDropdown); Vue.component(BaseButton.name, BaseButton); diff --git a/src/router/index.js b/src/router/index.js index 339aa94..cd48f3e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -6,7 +6,14 @@ Vue.use(VueRouter); // configure router const router = new VueRouter({ routes, // short for routes: routes - linkActiveClass: "active" + linkActiveClass: "active", + scrollBehavior: (to) => { + if (to.hash) { + return {selector: to.hash} + } else { + return { x: 0, y: 0 } + } + } }); export default router; diff --git a/src/router/routes.js b/src/router/routes.js index 2e4dea6..4ae27e4 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -4,7 +4,7 @@ import NotFound from "@/pages/NotFoundPage.vue"; // Admin pages import Dashboard from "@/pages/Dashboard.vue"; -import UserProfile from "@/pages/UserProfile.vue"; +import Profile from "@/pages/Profile.vue"; import Notifications from "@/pages/Notifications.vue"; import Icons from "@/pages/Icons.vue"; import Maps from "@/pages/Maps.vue"; @@ -23,9 +23,9 @@ const routes = [ component: Dashboard }, { - path: "stats", - name: "stats", - component: UserProfile + path: "profile", + name: "profile", + component: Profile }, { path: "notifications", @@ -54,7 +54,7 @@ const routes = [ } ] }, - { path: "*", component: NotFound } + { path: "*", component: NotFound }, ]; /**
+
+ {{user.title}} +
+ {{user.description}} +
- "I like the way you work it - No diggity - I wanna bag it up" -