danielvici123/esp-projekt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	api/main.ts
#	src/App.vue
#	src/router/index.ts
This commit is contained in:
danielvici123
2024-11-01 20:44:43 +01:00
parent cbc2e894ee c6dfae527b
commit 86c653bd51
3 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/App.vue
View File

@@ -1,6 +1,6 @@
<script setup lang="ts">
import Sidebar from "./components/home_components/navigationbar.vue";
import NiceThings from "./components/home_components/trending.vue";
import Sidebar from "./components/home_components/sidebar.vue";
import NiceThings from "./components/home_components/interesting-hashtags.vue";
import Feed from "./components/home_components/feed.vue";
import Contacts from "./components/home_components/contacts.vue";
import Legal from "./components/home_components/legal.vue";

29
src/router/index.ts
View File

@@ -1,7 +1,13 @@
import { createRouter, createWebHistory } from "vue-router";
// Vue components imported here.
// the vue components are the Pages that will be rendered
// at these URL's.
import Home from "../components/Home.vue";
import Login from "../components/Login.vue";
// The routing does not happen automatically
// Each route has to be defined here, or it wont work.
const routes = [
{
path: "/",
@@ -21,26 +27,3 @@ const router = createRouter({
});
export default router;
/*
<script setup lang="ts">
import Sidebar from "../src/components/navigationbar.vue";
import NiceThings from "../src/components/trending.vue";
import Feed from "../src/components/feed.vue";
import Contacts from "../src/components/contacts.vue";
import Legal from "../src/components/legal.vue";
</script>
<template>
<div id="main" class="bg-weiss flex p-2">
<Sidebar></Sidebar>
<nice-things></nice-things>
<feed></feed>
<div class="w-1/4">
<contacts></contacts>
<legal></legal>
</div>
</div>
</template>
*/