Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: beautify the official website pages and fix startup errors #369

Closed
wants to merge 2 commits into from
Closed

feat: beautify the official website pages and fix startup errors #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c432265
feat: beautify the official website pages
Trenki Jun 24, 2024
8579dec
Merge branch 'main' of github.com:ZJUEarthData/geochemistrypi into fe…
Trenki Jul 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions geochemistrypi/frontend/eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ export default [
'no-unused-vars': 2,
'space-before-function-paren': 0,
'generator-star-spacing': 'off',
'object-curly-spacing': 0, // 强制在大括号中使用一致的空格
'array-bracket-spacing': 0 // 方括号
'object-curly-spacing': 0, // Enforce consistent spacing within curly braces
'array-bracket-spacing': 0 // square brackets
}
}
]
2 changes: 1 addition & 1 deletion geochemistrypi/frontend/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite App</title>
<title>Geochemistry π</title>
</head>
<body>
<div id="app"></div>
Expand Down
1 change: 0 additions & 1 deletion geochemistrypi/frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"sass": "^1.76.0",
"sass-loader": "^14.2.1",
"typescript": "~5.4.0",
"typescript-eslint": "^7.11.0",
"unplugin-auto-import": "^0.17.5",
"unplugin-vue-components": "^0.27.0",
"vite": "^5.2.8",
Expand Down
Binary file modified geochemistrypi/frontend/public/favicon.ico
View file
Open in desktop
Binary file not shown.
Binary file added geochemistrypi/frontend/src/assets/imgs/onlyLogo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 16 additions & 4 deletions geochemistrypi/frontend/src/components/nav-bar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,18 @@ import { RouterLink } from 'vue-router'

<template>
<nav class="nav-bar">
<div class="logo"><img src="@/assets/imgs/logo.png" /></div>
<RouterLink class="logo" to="/"><img src="@/assets/imgs/logo.png" /></RouterLink>
<div class="nav-link">
<a href="https://github.com/ZJUEarthData/geochemistrypi/" target="_blank">Github</a>
<a href="https://github.com/ZJUEarthData/geochemistrypi/" target="_blank"><i class="el-icon"
style="font-size:32px;vertical-align: middle; margin-right: 8px;" data-v-72eabb9c=""><!--[--><svg
preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24" width="1.2em" height="1.2em" data-v-72eabb9c="">
<path fill="currentColor"
d="M12 2C6.475 2 2 6.475 2 12a9.994 9.994 0 0 0 6.838 9.488c.5.087.687-.213.687-.476c0-.237-.013-1.024-.013-1.862c-2.512.463-3.162-.612-3.362-1.175c-.113-.288-.6-1.175-1.025-1.413c-.35-.187-.85-.65-.013-.662c.788-.013 1.35.725 1.538 1.025c.9 1.512 2.338 1.087 2.912.825c.088-.65.35-1.087.638-1.337c-2.225-.25-4.55-1.113-4.55-4.938c0-1.088.387-1.987 1.025-2.688c-.1-.25-.45-1.275.1-2.65c0 0 .837-.262 2.75 1.026a9.28 9.28 0 0 1 2.5-.338c.85 0 1.7.112 2.5.337c1.912-1.3 2.75-1.024 2.75-1.024c.55 1.375.2 2.4.1 2.65c.637.7 1.025 1.587 1.025 2.687c0 3.838-2.337 4.688-4.562 4.938c.362.312.675.912.675 1.85c0 1.337-.013 2.412-.013 2.75c0 .262.188.574.688.474A10.016 10.016 0 0 0 22 12c0-5.525-4.475-10-10-10z">
</path>
</svg><!--]--></i>Github</a>
<a href="https://geochemistrypi.readthedocs.io/en/latest/" target="_blank">Docs</a>
<RouterLink to="/guide">Guide</RouterLink>
<RouterLink to="/"><span class="link-start">Get start</span></RouterLink>
<RouterLink to="/guide">About us </RouterLink>
<RouterLink to="/"><span class="link-start">Get started</span></RouterLink>
<RouterLink to="/">Sign in</RouterLink>
</div>
</nav>
Expand All @@ -22,24 +28,30 @@ import { RouterLink } from 'vue-router'
align-items: center;
justify-content: space-between;
padding: 0 20px;

.logo {
img {
height: 60px;
}
}

.nav-link {
display: flex;

a {
color: #fff;
margin-right: 45px;
line-height: 36px;
font-size: 24px;

&:last-of-type {
margin-right: 0px;
}

&:hover {
transform: scale(1.05);
}

.link-start {
background-color: #f25b28;
padding: 0 8px;
Expand Down
2 changes: 1 addition & 1 deletion geochemistrypi/frontend/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'element-plus/dist/index.css'
import { createApp } from 'vue'
import { createPinia } from 'pinia'

import App from './app.vue'
import App from './App.vue'
import router from './router'

const app = createApp(App)
Expand Down
16 changes: 14 additions & 2 deletions geochemistrypi/frontend/src/views/home/home-page.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<template>
<div class="home-page">
<div class="text-wrapper">
<h1>Geochemistry π</h1>
<p>A Python Framework For Geochemistry</p>
<div>
<h1><img class="logo" src="@/assets/imgs/onlyLogo.png" />Geochemistry π</h1>
<p>A Python Framework For Geochemistry</p>
</div>

</div>
</div>
</template>
Expand All @@ -19,7 +22,16 @@
margin-top: 180px;
font-size: 30px;
color: #fff;
display: flex;

.logo {
width: 96px;
line-height: 144px;
margin-right: 20px
}
p{
margin-left: 116px;
}
h1 {
color: #F25B28;
font-size: 90px;
Expand Down
Loading