Skip to content

feat: show git commit on nav bar #112

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

Merged
merged 2 commits into from
May 13, 2021
Merged

feat: show git commit on nav bar #112

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
7fa66fc
feat: show git commit on nav bar
ydcjeff May 13, 2021
373bd2a
style: little adjustments
ydcjeff May 13, 2021
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
2 changes: 1 addition & 1 deletion .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VITE_GIT_COMMIT=8a8c364fafdf20ee8504f004b9db54d9bc82eac4
VITE_COMMIT=3e6c8a07d35b2c22fdf4b484b4d43f818dc0ff06
5 changes: 5 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
href="/src/assets/ignite_logomark.svg"
/>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="preconnect" href="https://fonts.gstatic.com" />
<link
href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600&display=swap"
rel="stylesheet"
/>
<title>Code Generator</title>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion scripts/getCommit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ exec('git rev-parse HEAD', (err, stdout, stderr) => {
console.error(err)
}
console.log(stdout, process.env.COMMIT_REF)
fs.writeFileSync('./.env', `VITE_GIT_COMMIT=${stdout}`)
fs.writeFileSync('./.env', `VITE_COMMIT=${stdout}`)
})
14 changes: 12 additions & 2 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ export default {
--c-brand-yellow: #eaa700;
--c-text: #475569;
--font-size: 1rem;
--font-family-base: Avenir, -apple-system, BlinkMacSystemFont, 'Segoe UI',
Roboto, Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans',
--font-family-base: 'Inter', Avenir, -apple-system, BlinkMacSystemFont,
'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans',
'Helvetica Neue', sans-serif;
--code-font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;
--code-font-size: 0.85em;
Expand All @@ -68,6 +68,16 @@ body {
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
h1 {
font-weight: 600;
}
h2,
h3,
h4,
h5,
h6 {
font-weight: 500;
}
@media (prefers-reduced-motion) {
:focus {
border-radius: 3px;
Expand Down
35 changes: 18 additions & 17 deletions src/components/NavBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,17 @@
height="50"
/>
<span class="pname">Code Generator</span>
<small class="version">v{{ version }}</small>
</a>
</h1>
<div class="left-side-badges">
<a
:href="`https://github.com/pytorch-ignite/code-generator/commit/${currentCommit}`"
target="_blank"
rel="noopener noreferrer"
class="version external-links"
>
v{{ version }}@{{ currentCommit.slice(0, 7) }}
</a>
<button
@click="downloadProject"
class="download-button"
Expand Down Expand Up @@ -90,6 +97,7 @@ export default {
setup() {
let zip = new JSZip()
const showDownloadMsg = ref(false)
const currentCommit = import.meta.env.VITE_COMMIT

const downloadProject = () => {
for (const filename in store.code) {
Expand All @@ -100,7 +108,7 @@ export default {
})
showDownloadMsg.value = true
}
return { version, downloadProject, showDownloadMsg }
return { version, downloadProject, showDownloadMsg, currentCommit }
}
}
</script>
Expand All @@ -121,7 +129,6 @@ h1 img {
}
.external-links {
margin: 0 0.5rem;
font-size: var(--font-size);
border-bottom: 2px solid transparent;
}
.external-links:hover {
Expand All @@ -134,26 +141,17 @@ h1 img {
justify-content: space-between;
border-bottom: 1px solid var(--c-white-dark);
}
.version {
padding: 0.25rem 0.5rem;
font-size: 0.875rem;
line-height: 1.25rem;
margin-left: 0.25rem;
background-color: #007bff;
border-radius: 8px 2px 8px 2px;
color: var(--c-white-light);
font-weight: bolder;
}
.left-side-badges {
display: flex;
align-items: center;
font-size: 0.9em;
}
.download-button {
background: none;
color: var(--c-text);
cursor: pointer;
font-family: var(--font-family-base);
font-size: var(--font-size);
font-size: 1em;
padding-top: 0;
padding-bottom: 0;
}
Expand Down Expand Up @@ -190,20 +188,23 @@ h1 img {
color: var(--c-brand-red);
}
.icon-text {
margin-left: 0.5rem;
margin-left: 0.25rem;
}
/* media queries */
@media (max-width: 768px) {
.pname,
.version {
.pname {
display: none;
}
.nav-bar {
position: fixed;
z-index: 6;
width: 100%;
padding: 0.5rem 0.5rem 0;
background-color: var(--c-white);
}
.external-links {
margin: 0 0.25rem;
}
.icon-text {
display: none;
}
Expand Down
4 changes: 2 additions & 2 deletions src/store.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ const isProd = import.meta.env.PROD
// @ts-ignore
const isDev = import.meta.env.DEV
// @ts-ignore
const gitCommit = import.meta.env.VITE_GIT_COMMIT
const commit = import.meta.env.VITE_COMMIT

// set url for template fetching
// this only works in production and local mode
// not in network mode
const urlTemplates = 'src/templates'
const urlDev = `${location.href}/${urlTemplates}`
const urlProd = `https://raw.githubusercontent.com/pytorch-ignite/code-generator/${gitCommit}/${urlTemplates}`
const urlProd = `https://raw.githubusercontent.com/pytorch-ignite/code-generator/${commit}/${urlTemplates}`
const url = isDev ? urlDev : isProd ? urlProd : null

// ejs options
Expand Down