diff --git a/frontend/public/assets/img/avatars/avatar-2.png b/frontend/public/assets/img/avatars/avatar-2.png new file mode 100644 index 0000000..9eb3ec9 Binary files /dev/null and b/frontend/public/assets/img/avatars/avatar-2.png differ diff --git a/frontend/public/assets/img/avatars/avatar-3.png b/frontend/public/assets/img/avatars/avatar-3.png new file mode 100644 index 0000000..a0dbc96 Binary files /dev/null and b/frontend/public/assets/img/avatars/avatar-3.png differ diff --git a/frontend/public/assets/img/avatars/avatar-4.png b/frontend/public/assets/img/avatars/avatar-4.png new file mode 100644 index 0000000..de75ef6 Binary files /dev/null and b/frontend/public/assets/img/avatars/avatar-4.png differ diff --git a/frontend/public/assets/img/avatars/avatar-5.png b/frontend/public/assets/img/avatars/avatar-5.png new file mode 100644 index 0000000..40d595e Binary files /dev/null and b/frontend/public/assets/img/avatars/avatar-5.png differ diff --git a/frontend/public/assets/img/avatars/avatar-6.png b/frontend/public/assets/img/avatars/avatar-6.png new file mode 100644 index 0000000..bc8577c Binary files /dev/null and b/frontend/public/assets/img/avatars/avatar-6.png differ diff --git a/frontend/public/assets/img/avatars/avatar.png b/frontend/public/assets/img/avatars/avatar.png new file mode 100644 index 0000000..894246c Binary files /dev/null and b/frontend/public/assets/img/avatars/avatar.png differ diff --git a/frontend/public/assets/img/photos/unsplash-1.jpg b/frontend/public/assets/img/photos/unsplash-1.jpg new file mode 100644 index 0000000..ccc3963 Binary files /dev/null and b/frontend/public/assets/img/photos/unsplash-1.jpg differ diff --git a/frontend/public/assets/img/photos/unsplash-2.jpg b/frontend/public/assets/img/photos/unsplash-2.jpg new file mode 100644 index 0000000..3a33349 Binary files /dev/null and b/frontend/public/assets/img/photos/unsplash-2.jpg differ diff --git a/frontend/public/assets/img/photos/unsplash-3.jpg b/frontend/public/assets/img/photos/unsplash-3.jpg new file mode 100644 index 0000000..bc287e5 Binary files /dev/null and b/frontend/public/assets/img/photos/unsplash-3.jpg differ diff --git a/frontend/src/components/BaseLayout.vue b/frontend/src/components/BaseLayout.vue index 2bb7427..f8b01ab 100644 --- a/frontend/src/components/BaseLayout.vue +++ b/frontend/src/components/BaseLayout.vue @@ -1,37 +1,6 @@ @@ -118,10 +33,16 @@ import {mapGetters, mapMutations, mapState} from 'vuex'; import * as BIcons from "bootstrap-icons-vue"; import Notifications from "@/components/Notifications.vue"; import Messages from "@/components/Messages.vue"; +import Footer from "@/components/Footer.vue"; +import Sidebar from "@/components/Sidebar.vue"; +import UserDropdown from "@/components/UserDropdown.vue"; export default { name: 'BaseLayout', components: { + UserDropdown, + Sidebar, + Footer, Messages, Notifications, ...BIcons diff --git a/frontend/src/components/Footer.vue b/frontend/src/components/Footer.vue new file mode 100644 index 0000000..b4cfa96 --- /dev/null +++ b/frontend/src/components/Footer.vue @@ -0,0 +1,43 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/components/Messages.vue b/frontend/src/components/Messages.vue index 99e880b..52be31e 100644 --- a/frontend/src/components/Messages.vue +++ b/frontend/src/components/Messages.vue @@ -16,8 +16,8 @@
- + Vanessa Tucker
Vanessa Tucker
@@ -31,8 +31,8 @@
- + William Harris
William Harris
@@ -46,8 +46,8 @@
- + Christina Mason
Christina Mason
@@ -57,12 +57,11 @@
-
- + Sharon Lessman
Sharon Lessman
@@ -74,7 +73,6 @@
-
Show all messages diff --git a/frontend/src/components/Sidebar.vue b/frontend/src/components/Sidebar.vue new file mode 100644 index 0000000..64d75c2 --- /dev/null +++ b/frontend/src/components/Sidebar.vue @@ -0,0 +1,37 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/components/UserDropdown.vue b/frontend/src/components/UserDropdown.vue new file mode 100644 index 0000000..01c5031 --- /dev/null +++ b/frontend/src/components/UserDropdown.vue @@ -0,0 +1,46 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/views/Friends.vue b/frontend/src/views/Friends.vue index 3a21812..f70f4ae 100644 --- a/frontend/src/views/Friends.vue +++ b/frontend/src/views/Friends.vue @@ -19,7 +19,7 @@ - + {{ friend.name }} {{ friend.server.join(', ') }} @@ -34,6 +34,10 @@
+
+ + Add +
@@ -54,31 +58,36 @@ export default { }, data() { return { - friends: [], + friends: {}, } }, computed: { username() { return this.$route.params.username }, - inventory_items() { - return this.local_items.concat(this.eleon_items) + friendslist() { + return Object.keys(this.friends).map((friend) => { + return { + name: friend, + server: this.friends[friend] + } + }) } }, methods: { ...mapActions(['getFriends', "getFriendServer"]), - }, - mounted() { - this.getFriends().then((friends) => { - friends.map((friend) => { - this.getFriendServer({username: friend}).then((server) => { - this.friends.push({ - name: friend, - server: server + fetchFriends() { + this.getFriends().then((friends) => { + friends.map((friend) => { + this.getFriendServer({username: friend}).then((server) => { + this.friends[friend] = server }) }) }) - }) + } + }, + mounted() { + this.fetchFriends() } } diff --git a/frontend/src/views/Profile.vue b/frontend/src/views/Profile.vue index 50ecade..3fec4eb 100644 --- a/frontend/src/views/Profile.vue +++ b/frontend/src/views/Profile.vue @@ -12,9 +12,9 @@
Profile Details
- + height="128"/>
{{ user.username }}
@@ -94,8 +94,8 @@
- + Vanessa Tucker
5m ago Vanessa Tucker started following Christina @@ -107,8 +107,8 @@
- + Charles Hall
30m ago Charles Hall posted something on Christina @@ -132,8 +132,8 @@
- + Christina Mason
1h ago Christina Mason posted a new blog
@@ -144,8 +144,8 @@
- + William Harris
3h ago William Harris posted two photos on Christina @@ -154,12 +154,12 @@
- + Unsplash
- + Unsplash
@@ -171,8 +171,8 @@
- + William Harris
1d ago William Harris started following Christina @@ -181,8 +181,8 @@
- + Christina Mason
@@ -196,8 +196,8 @@
- + Christina Mason
1d ago Christina Mason posted a new blog
@@ -207,8 +207,8 @@
- + Charles Hall
1d ago Charles Hall started following Christina @@ -223,7 +223,6 @@
-
diff --git a/frontend/src/views/Settings.vue b/frontend/src/views/Settings.vue index d143c7e..8784570 100644 --- a/frontend/src/views/Settings.vue +++ b/frontend/src/views/Settings.vue @@ -79,7 +79,7 @@
Charles Hall
diff --git a/frontend/vite.config.js b/frontend/vite.config.js index 1c3c751..77d9cc8 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -19,7 +19,8 @@ export default defineConfig({ //'Access-Control-Allow-Origin': 'http://10.23.42.128:8000, http://10.23.42.168:8000', 'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, OPTIONS', 'Access-Control-Allow-Headers': 'Origin, Content-Type, X-Auth-Token, Authorization, Accept,charset,boundary,Content-Length', - 'Access-Control-Allow-Credentials': 'true' + 'Access-Control-Allow-Credentials': 'true', + 'Content-Security-Policy': 'default-src \'self\' \'unsafe-inline\' \'unsafe-eval\' data: \'self\' connect-src *', // change to https://* for production }, proxy: { '^/api/': { @@ -36,6 +37,13 @@ export default defineConfig({ }, '^/static/': { target: "http://127.0.0.1:8000/", + }, + '^/wiki/': { + target: "http://127.0.0.1:8080/", + rewrite: (path) => path.replace(/^\/wiki/, ''), + }, + '^/livereload/': { + target: "http://127.0.0.1:8080/", } } }