Merge pull request #337 from mikecao/dev

v1.2.0

Procfile

@@ -0,0 +1 @@
+web: npm run start-env

components/forms/AccountEditForm.js

@@ -58,15 +58,19 @@ export default function AccountEditForm({ values, onSave, onClose }) {
               <label htmlFor="username">
                 <FormattedMessage id="label.username" defaultMessage="Username" />
               </label>
-              <Field name="username" type="text" />
+              <div>
-              <FormError name="username" />
+                <Field name="username" type="text" />
+                <FormError name="username" />
+              </div>
             </FormRow>
             <FormRow>
               <label htmlFor="password">
                 <FormattedMessage id="label.password" defaultMessage="Password" />
               </label>
-              <Field name="password" type="password" />
+              <div>
-              <FormError name="password" />
+                <Field name="password" type="password" />
+                <FormError name="password" />
+              </div>
             </FormRow>
             <FormButtons>
               <Button type="submit" variant="action">

components/forms/ChangePasswordForm.js

@@ -66,22 +66,28 @@ export default function ChangePasswordForm({ values, onSave, onClose }) {
               <label htmlFor="current_password">
                 <FormattedMessage id="label.current-password" defaultMessage="Current password" />
               </label>
-              <Field name="current_password" type="password" />
+              <div>
-              <FormError name="current_password" />
+                <Field name="current_password" type="password" />
+                <FormError name="current_password" />
+              </div>
             </FormRow>
             <FormRow>
               <label htmlFor="new_password">
                 <FormattedMessage id="label.new-password" defaultMessage="New password" />
               </label>
-              <Field name="new_password" type="password" />
+              <div>
-              <FormError name="new_password" />
+                <Field name="new_password" type="password" />
+                <FormError name="new_password" />
+              </div>
             </FormRow>
             <FormRow>
               <label htmlFor="confirm_password">
                 <FormattedMessage id="label.confirm-password" defaultMessage="Confirm password" />
               </label>
-              <Field name="confirm_password" type="password" />
+              <div>
-              <FormError name="confirm_password" />
+                <Field name="confirm_password" type="password" />
+                <FormError name="confirm_password" />
+              </div>
             </FormRow>
             <FormButtons>
               <Button type="submit" variant="action">

components/forms/DeleteForm.js

@@ -73,8 +73,10 @@ export default function DeleteForm({ values, onSave, onClose }) {
               />
             </p>
             <FormRow>
-              <Field name="confirmation" type="text" />
+              <div>
-              <FormError name="confirmation" />
+                <Field name="confirmation" type="text" />
+                <FormError name="confirmation" />
+              </div>
             </FormRow>
             <FormButtons>
               <Button

components/forms/LoginForm.js

@@ -71,15 +71,19 @@ export default function LoginForm() {
               <label htmlFor="username">
                 <FormattedMessage id="label.username" defaultMessage="Username" />
               </label>
-              <Field name="username" type="text" />
+              <div>
-              <FormError name="username" />
+                <Field name="username" type="text" />
+                <FormError name="username" />
+              </div>
             </FormRow>
             <FormRow>
               <label htmlFor="password">
                 <FormattedMessage id="label.password" defaultMessage="Password" />
               </label>
-              <Field name="password" type="password" />
+              <div>
-              <FormError name="password" />
+                <Field name="password" type="password" />
+                <FormError name="password" />
+              </div>
             </FormRow>
             <FormButtons>
               <Button type="submit" variant="action">

components/forms/WebsiteEditForm.js

@@ -63,15 +63,19 @@ export default function WebsiteEditForm({ values, onSave, onClose }) {
               <label htmlFor="name">
                 <FormattedMessage id="label.name" defaultMessage="Name" />
               </label>
-              <Field name="name" type="text" />
+              <div>
-              <FormError name="name" />
+                <Field name="name" type="text" />
+                <FormError name="name" />
+              </div>
             </FormRow>
             <FormRow>
               <label htmlFor="domain">
                 <FormattedMessage id="label.domain" defaultMessage="Domain" />
               </label>
-              <Field name="domain" type="text" />
+              <div>
-              <FormError name="domain" />
+                <Field name="domain" type="text" />
+                <FormError name="domain" />
+              </div>
             </FormRow>
             <FormRow>
               <label></label>

components/layout/FormLayout.module.css

@@ -17,6 +17,10 @@
   line-height: 1.8;
 }
 
+.row > div {
+  position: relative;
+}
+
 .buttons {
   display: flex;
   justify-content: center;
@@ -33,9 +37,9 @@
   justify-content: center;
   align-items: center;
   top: 0;
-  left: 100%;
+  left: calc(100% + 16px);
   bottom: 0;
-  margin-left: 16px;
+  z-index: 1;
 }
 
 .msg {
@@ -68,3 +72,15 @@
   color: var(--gray50);
   background: var(--gray800);
 }
+
+@media only screen and (max-width: 576px) {
+  .error {
+    align-items: flex-start;
+    top: calc(100% + 7px);
+    left: 0;
+  }
+
+  .error:after {
+    left: 10px;
+  }
+}

components/metrics/WebsiteHeader.module.css

@@ -1,5 +1,5 @@
 .title {
-  color: var(--gray-900);
+  color: var(--gray900);
   font-size: var(--font-size-large);
   line-height: var(--font-size-large);
 }

lang/pt-PT.json

@@ -3,8 +3,8 @@
   "label.add-account": "Adicionar conta",
   "label.add-website": "Adicionar website",
   "label.administrator": "Administrador",
-  "label.all": "All",
+  "label.all": "Todos",
-  "label.all-websites": "All websites",
+  "label.all-websites": "Todos os websites",
   "label.back": "Voltar",
   "label.cancel": "Cancelar",
   "label.change-password": "Alterar palavra-passe",
@@ -37,8 +37,8 @@
   "label.password": "Palavra-passe",
   "label.passwords-dont-match": "Palavra-passes não correspondem",
   "label.profile": "Perfil",
-  "label.realtime": "Realtime",
+  "label.realtime": "Tempo real",
-  "label.realtime-logs": "Realtime logs",
+  "label.realtime-logs": "Relatório em tempo real",
   "label.refresh": "Atualizar",
   "label.required": "Obrigatório",
   "label.reset": "Repor",
@@ -65,7 +65,7 @@
   "message.get-tracking-code": "Obter código de tracking",
   "message.go-to-settings": "Ir para as definições",
   "message.incorrect-username-password": "Nome de utilizador/palavra-passe incorretos.",
-  "message.log.visitor": "Visitor from {country} using {browser} on {os} {device}",
+  "message.log.visitor": "Visitante de {country} a usar {browser} no {device} {os}",
   "message.new-version-available": "Uma nova versão de umami {version} está disponível!",
   "message.no-data-available": "Sem dados disponíveis.",
   "message.no-websites-configured": "Não tens nenhum website configurado.",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "A simple, fast, website analytics alternative to Google Analytics. ",
   "author": "Mike Cao <mike@mikecao.com>",
   "license": "MIT",

scripts/start-env.js

@@ -1,3 +1,3 @@
 const cli = require('next/dist/cli/next-start');
 
-cli.nextStart(['-p', process.env.PORT || 3000, '-H', process.env.HOSTNAME || 'localhost']);
+cli.nextStart(['-p', process.env.PORT || 3000, '-H', process.env.HOSTNAME || '0.0.0.0']);